(make_ctrl_char): If C is a multibyte character, just

return it ORed with ctrl_modifier.

diff --git a/src/ChangeLog b/src/ChangeLog
index eac48d83fbbb367f3699b18de7f00db5507ecd30..bef208cc3f99ca0e7210ffd2582c334b1f7b75f2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-31  Kenichi Handa  <handa@ni.aist.go.jp>
+
+       * keyboard.c (make_ctrl_char): If C is a multibyte character, just
+       return it ORed with ctrl_modifier.
+
 2008-01-26  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
        * fns.c (Fclrhash): Return TABLE.

diff --git a/src/keyboard.c b/src/keyboard.c
index 097decb66a7db6316364088e54e317d302204694..20ecf203324d4db4d0a15c8638d84e6bcd51de37 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2310,6 +2310,9 @@ make_ctrl_char (c)
   /* Save the upper bits here.  */
   int upper = c & ~0177;
 
+  if (! ASCII_BYTE_P (c))
+    return c |= ctrl_modifier;
+
   c &= 0177;
 
   /* Everything in the columns containing the upper-case letters